(CGFloat) [!CGFLOAT_DEFINED]: New typedef.

(mac_rect_make): New macro.

diff --git a/src/macgui.h b/src/macgui.h
index 1f4e454c714fff0e66aa5da3363a9d10e43833cc..c1558e98bfe132deb501c16a269134e15605caff 100644 (file)
--- a/src/macgui.h
+++ b/src/macgui.h
@@ -124,6 +124,10 @@ typedef unsigned long Time;
 #endif
 #endif
 
+#ifndef CGFLOAT_DEFINED
+typedef float CGFloat;
+#endif
+
 typedef WindowRef Window;
 #if TARGET_API_MAC_CARBON
 typedef ScrapRef Selection;
@@ -147,6 +151,7 @@ typedef int Selection;
 #define mac_size_window                SizeWindow
 #define mac_get_global_mouse   GetGlobalMouse
 #define mac_is_window_toolbar_visible  IsWindowToolbarVisible
+#define mac_rect_make(f, x, y, w, h)   CGRectMake (x, y, w, h)
 typedef GWorldPtr Pixmap;
 
 #define Cursor ThemeCursor